From 826c9da7277a36bfa28623d17e7e37c2967b1a7e Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Thu, 14 Dec 2006 11:01:37 -0700 Subject: [PATCH] [IA64] Use sn_sal.h directly from upstream Linux Take a straight copy of sn_sal.h from linux 2.6.19 - there is no reason to hide parts of this file as it's all macros and inline functions Signed-off-by: Jes Sorensen --- xen/include/asm-ia64/linux-xen/asm/sn/README.origin | 1 - xen/include/asm-ia64/linux/asm/sn/README.origin | 1 + xen/include/asm-ia64/{linux-xen => linux}/asm/sn/sn_sal.h | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) rename xen/include/asm-ia64/{linux-xen => linux}/asm/sn/sn_sal.h (99%) diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/README.origin b/xen/include/asm-ia64/linux-xen/asm/sn/README.origin index 3adc60fea0..762d1f5a9c 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/README.origin +++ b/xen/include/asm-ia64/linux-xen/asm/sn/README.origin @@ -13,5 +13,4 @@ io.h -> linux/include/asm-ia64/sn/io.h nodepda.h -> linux/include/asm-ia64/sn/nodepda.h pcibr_provider.h -> linux/include/asm-ia64/sn/pcibr_provider.h rw_mmr.h -> linux/include/asm-ia64/sn/rw_mmr.h -sn_sal.h -> linux/include/asm-ia64/sn/sn_sal.h types.h -> linux/include/asm-ia64/sn/types.h diff --git a/xen/include/asm-ia64/linux/asm/sn/README.origin b/xen/include/asm-ia64/linux/asm/sn/README.origin index da44c15c0a..5d8d7cb671 100644 --- a/xen/include/asm-ia64/linux/asm/sn/README.origin +++ b/xen/include/asm-ia64/linux/asm/sn/README.origin @@ -18,6 +18,7 @@ shubio.h -> linux/include/asm-ia64/sn/shubio.h simulator.h -> linux/include/asm-ia64/sn/simulator.h sn_cpuid.h -> linux/include/asm-ia64/sn/sn_cpuid.h sn_feature_sets.h -> linux/include/asm-ia64/sn/sn_feature_sets.h +sn_sal.h -> linux/include/asm-ia64/sn/sn_sal.h tiocp.h -> linux/include/asm-ia64/sn/tiocp.h xbow.h -> linux/arch/ia64/sn/include/xtalk/xbow.h xwidgetdev.h -> linux/arch/ia64/sn/include/xtalk/xwidgetdev.h diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/sn_sal.h b/xen/include/asm-ia64/linux/asm/sn/sn_sal.h similarity index 99% rename from xen/include/asm-ia64/linux-xen/asm/sn/sn_sal.h rename to xen/include/asm-ia64/linux/asm/sn/sn_sal.h index a87e6592b2..ba826b3f75 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/sn_sal.h +++ b/xen/include/asm-ia64/linux/asm/sn/sn_sal.h @@ -148,7 +148,6 @@ #define SN_SAL_FAKE_PROM 0x02009999 -#ifndef XEN /** * sn_sal_revision - get the SGI SAL revision number * @@ -222,7 +221,6 @@ ia64_sn_get_klconfig_addr(nasid_t nasid) SAL_CALL(ret_stuff, SN_SAL_GET_KLCONFIG_ADDR, (u64)nasid, 0, 0, 0, 0, 0, 0); return ret_stuff.v0 ? __va(ret_stuff.v0) : NULL; } -#endif /* !XEN */ /* * Returns the next console character. @@ -301,7 +299,6 @@ ia64_sn_console_putb(const char *buf, int len) return (u64)0; } -#ifndef XEN /* * Print a platform error record */ @@ -1086,7 +1083,6 @@ ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2, *v0 = (int) rv.v0; return (int) rv.status; } -#endif /* !XEN */ static inline int ia64_sn_ioif_get_pci_topology(u64 buf, u64 len) -- 2.30.2